Auto merge of #1370 - alexcrichton:issue-1299, r=huonw
authorbors <bors@rust-lang.org>
Tue, 3 Mar 2015 03:52:16 +0000 (03:52 +0000)
committerbors <bors@rust-lang.org>
Tue, 3 Mar 2015 03:52:16 +0000 (03:52 +0000)
Apparently git submodules are checked in as '/' not '\' so if a '\' leaks
through it'll end up not being found!

Closes #1299


Trivial merge